luci-mod-system: add missing require to `none` led trigger class

Also convert ES6 to ES5 syntax while we're at it.

Fixes: #5476
Fixes: 5b42cd5b46 ("luci-mod-system: move default option from defaul-on trigger to none trigger")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit fceabd74465f2aafc40edc084429f30837deff2c)

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/default-on.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/default-on.js
index b9713cef1cff80c2b6605da4d33f5f2a2305c782..10bf7d323832e91354465dd1a5bc70baf9117da1 100644 (file)
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/default-on.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/default-on.js
@@ -1,11 +1,8 @@
 'use strict';
 'require baseclass';
-'require form';
 
 return baseclass.extend({
        trigger: _('Always on (kernel: default-on)'),
        kernel: true,
-       addFormOptions(s){
-               var o;
-       }
+       addFormOptions: function(s) {}
 });

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js
index 9050063bf20e56631672c98caa66a49e3db0f66e..5a12575084c23bdc9d9a2ee3c8df434ca4882104 100644 (file)
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/heartbeat.js
@@ -4,7 +4,5 @@
 return baseclass.extend({
        trigger: _('Heartbeat interval (kernel: heartbeat)'),
        kernel: true,
-       addFormOptions(s){
-               var o;
-       }
+       addFormOptions: function(s) {}
 });

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/netdev.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/netdev.js
index 692c887ea4313c15b7053acc78ff44fbb46be402..c7cefbb0cb339a84ee24eeaa233f7f3998a2a86f 100644 (file)
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/netdev.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/netdev.js
@@ -6,7 +6,7 @@
 return baseclass.extend({
        trigger: _("Network device activity (kernel: netdev)"),
        kernel: true,
-       addFormOptions(s){
+       addFormOptions: function(s) {
                var o;
 
                o = s.option(widgets.DeviceSelect, '_net_dev', _('Device'));

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/none.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/none.js
index 8542a6cda765a4013efb3137ec007dd8a76a4975..361084f4cff75e168fcb1a75f1893d2d87f6997f 100644 (file)
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/none.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/none.js
@@ -1,10 +1,11 @@
 'use strict';
+'require form';
 'require baseclass';
 
 return baseclass.extend({
        trigger: _('Always off (kernel: none)'),
        kernel: true,
-       addFormOptions(s){
+       addFormOptions: function(s) {
                var o;
 
                o = s.option(form.Flag, 'default', _('Default state'));

diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js
index 1ec362b60115c452f9d914d29616ce6c6f503d11..43d26613b1e47f4bb47f37ce3138d13ce05f6ba9 100644 (file)
--- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js
+++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js
@@ -5,7 +5,7 @@
 return baseclass.extend({
        trigger: _('Custom flash interval (kernel: timer)'),
        kernel: true,
-       addFormOptions(s){
+       addFormOptions: function(s) {
                var o;
 
                o = s.option(form.Value, 'delayon', _('On-State Delay'));